[IA64] swiotlb clash fix
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 12 Sep 2006 17:42:27 +0000 (11:42 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 12 Sep 2006 17:42:27 +0000 (11:42 -0600)
Do not define dma_supported to platform_dma_supported when building
the Xen kernel. This happend to work for DIG builds because the
swiotlb.c version of dma_supported compiles to identical code as
arch/i386/kernel/pci-dma-xen.c so the linker didn't complain.

Signed-off-by: Jes Sorensen <jes@sgi.com>
linux-2.6-xen-sparse/include/asm-ia64/dma-mapping.h

index 5d0206c4691268fa477719da852442490a5de1cb..aadda2addfe0c07e2008bcf17d4674801ea8efb0 100644 (file)
@@ -84,7 +84,9 @@ dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems,
 #define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir)   \
        dma_sync_single_for_device(dev, dma_handle, size, dir)
 
+#ifndef CONFIG_XEN
 #define dma_supported          platform_dma_supported
+#endif
 
 static inline int
 dma_set_mask (struct device *dev, u64 mask)